From 31c848a303d426e9ea7b4b7a23a51707c5b199f1 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Sat, 24 Jan 2004 07:22:03 +0000 Subject: [PATCH] bitkeeper revision 1.692 (40121d1bBkNbPNTOp6omHUYX1QhV1w) xl_vbd.c, XenoUtil.py, VBD-HOWTO.txt: Fix VBD init code, and move the sqlite db again. --- docs/VBD-HOWTO.txt | 4 ++-- tools/xc/py/XenoUtil.py | 4 ++-- xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/VBD-HOWTO.txt b/docs/VBD-HOWTO.txt index 9a13404a0a..9abec5d482 100644 --- a/docs/VBD-HOWTO.txt +++ b/docs/VBD-HOWTO.txt @@ -86,7 +86,7 @@ Virtual Disk Management The VD management code runs entirely in userspace. The code is written in Python and can therefore be accessed from custom scripts, as well as from the convenience scripts provided. The underlying VD database is a SQLite database -in /var/lib/xen_vdisks.sqlite. +in /var/db/xen_vdisks.sqlite. The scripts provided are as follows: @@ -131,7 +131,7 @@ More detail: When you use vd_format.py to add a device to the free space pool, the device is logically split up into extents. These extents are recorded in the Virtual -Disk Management database in /var/lib/xen_vdisks.sqlite. +Disk Management database in /var/db/xen_vdisks.sqlite. When you use vd_create.py to add create a virtual disk, some of the extents in the free space pool are reallocated for that virtual disk and a record for that diff --git a/tools/xc/py/XenoUtil.py b/tools/xc/py/XenoUtil.py index ee4dd79edc..5b0464f961 100644 --- a/tools/xc/py/XenoUtil.py +++ b/tools/xc/py/XenoUtil.py @@ -3,9 +3,9 @@ import string, re, os, sys ##### Module variables """Location of the Virtual Disk management database. - defaults to /var/lib/xen_vdisks.sqlite + defaults to /var/db/xen_vdisks.sqlite """ -VD_DB_FILE = "/var/lib/xen_vdisks.sqlite" +VD_DB_FILE = "/var/db/xen_vdisks.sqlite" """VBD expertise level - determines the strictness of the sanity checking. This mode determines the level of complaints when disk sharing occurs diff --git a/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c b/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c index a927df86bc..b106c57e69 100644 --- a/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c +++ b/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c @@ -457,7 +457,7 @@ void xlvbd_update_vbds(void) else { if ( (memcmp(&old_info[i], &new_info[j], sizeof(xen_disk_t)) == 0) || - (xlvbd_remove_device(old_info[i].device) == 0) ) + (xlvbd_remove_device(old_info[i].device) != 0) ) memcpy(&merged_info[k++], &old_info[i], sizeof(xen_disk_t)); else if ( xlvbd_init_device(&new_info[j]) == 0 ) memcpy(&merged_info[k++], &new_info[j], sizeof(xen_disk_t)); -- 2.30.2